Merge remote-tracking branch 'upstream/master'
authortsteven4 <tsteven4@gmail.com>
Sun, 7 Feb 2016 21:07:57 +0000 (14:07 -0700)
committertsteven4 <tsteven4@gmail.com>
Sun, 7 Feb 2016 21:07:57 +0000 (14:07 -0700)

Trivial merge